From 9d41afc90a3f261db2cab33e240b34232c2b117f Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Fri, 15 Dec 2000 03:16:35 +0000 Subject: [PATCH] only AC_DEFINE(HAVE_XFT) if we actually determined that we have Xrender 2000-12-14 Havoc Pennington * configure.in: only AC_DEFINE(HAVE_XFT) if we actually determined that we have Xrender --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ configure.in | 2 +- 8 files changed, 36 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0f848f5141..642a4e8592 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-12-14 Havoc Pennington + + * configure.in: only AC_DEFINE(HAVE_XFT) if we actually determined + that we have Xrender + Thu Dec 14 20:22:31 2000 Owen Taylor * gdk/{gdkdrawable.[ch],gdkpixmap.c,gdkwindow.c,x11/gdkwindow.c}: diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 0f848f5141..642a4e8592 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +2000-12-14 Havoc Pennington + + * configure.in: only AC_DEFINE(HAVE_XFT) if we actually determined + that we have Xrender + Thu Dec 14 20:22:31 2000 Owen Taylor * gdk/{gdkdrawable.[ch],gdkpixmap.c,gdkwindow.c,x11/gdkwindow.c}: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0f848f5141..642a4e8592 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2000-12-14 Havoc Pennington + + * configure.in: only AC_DEFINE(HAVE_XFT) if we actually determined + that we have Xrender + Thu Dec 14 20:22:31 2000 Owen Taylor * gdk/{gdkdrawable.[ch],gdkpixmap.c,gdkwindow.c,x11/gdkwindow.c}: diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 0f848f5141..642a4e8592 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2000-12-14 Havoc Pennington + + * configure.in: only AC_DEFINE(HAVE_XFT) if we actually determined + that we have Xrender + Thu Dec 14 20:22:31 2000 Owen Taylor * gdk/{gdkdrawable.[ch],gdkpixmap.c,gdkwindow.c,x11/gdkwindow.c}: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 0f848f5141..642a4e8592 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2000-12-14 Havoc Pennington + + * configure.in: only AC_DEFINE(HAVE_XFT) if we actually determined + that we have Xrender + Thu Dec 14 20:22:31 2000 Owen Taylor * gdk/{gdkdrawable.[ch],gdkpixmap.c,gdkwindow.c,x11/gdkwindow.c}: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 0f848f5141..642a4e8592 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2000-12-14 Havoc Pennington + + * configure.in: only AC_DEFINE(HAVE_XFT) if we actually determined + that we have Xrender + Thu Dec 14 20:22:31 2000 Owen Taylor * gdk/{gdkdrawable.[ch],gdkpixmap.c,gdkwindow.c,x11/gdkwindow.c}: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 0f848f5141..642a4e8592 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2000-12-14 Havoc Pennington + + * configure.in: only AC_DEFINE(HAVE_XFT) if we actually determined + that we have Xrender + Thu Dec 14 20:22:31 2000 Owen Taylor * gdk/{gdkdrawable.[ch],gdkpixmap.c,gdkwindow.c,x11/gdkwindow.c}: diff --git a/configure.in b/configure.in index 7e4bb057ab..5295327e54 100644 --- a/configure.in +++ b/configure.in @@ -409,9 +409,9 @@ if test "x$gdktarget" = "xx11"; then if $have_xft = 'true' ; then X_LIBS="-lXft -lXrender -lXext $X_LIBS" + AC_DEFINE(HAVE_XFT) fi - AC_DEFINE(HAVE_XFT) AM_CONDITIONAL(HAVE_XFT, $have_xft) # Check for XIM support. -- 2.30.2